merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 9 Dec 2011 05:23:18 +0000 (14:23 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 9 Dec 2011 05:23:18 +0000 (14:23 +0900)

Trivial merge